Cleanup controllers, helpers, views, models

What this does
---
 - Initial Cleanup, see in line comments