Whitespace and minute refactoring