Refactor comments and method names