comment model refactoring