Cleaning up views and controllers and models and such