Refactoring, comments