cleaned up form fields