Refactor Register Form