Volunteer Registration, clean up some code