Refactoring APP.forms.make