Refactoring comment form