Refactor: Tidy up code style and remove comment