Don't be sloppy, fix up some naming conventions and remove unnedded code in some controllers