pretty up the form some more.
Remove more boilerplate now that I have a better idea of what the generator did.