Fixing up the registration form
Organizing code