Refactored comments and method names