Normalize whitespace
refactor for cleaner code organization