Refactoring, commenting