Refactor: Comments