Refactored to setup_form