Signup form, some cleanup