comments, refactoring