various iterative style tweaks
fixed merge conflict
Merge pull request #118 from acjetnut/registration-form

various iterative style tweaks