Refactoring - white space