More clean up and completed form validation