Refactor forms into partial