White space, comments, refactoring