Refactor including form partial