Improve code readability and consistency. VISUAL only. (no feature/behavior changes)