Refactored form creation to a different module