Fixed all Edits after Code Review

I have ignored several recommendations as I think moving to MVC will
accomplish these goals.