Proposed code format for improved readability/cleaner look.