refactoring, long comments