Class based refactoring, comments