Refactor Form Behavior