Refactor: Dead comments and whitespace