Comments, refactoring