Refactor comment collection to mixin
Refactor comment form to mixin
Merge branch 'refactoring'