- Code clean up to reduce indentation.