Refactoring comment and form