Refactoring comments and method names;