Refactor Form