Refactor: Basic whitespace