Cleanup and make fields required on form