Refactor of forms to accommodate better error handling