Cleaned up and met current spec for registration form