comment form refactor