Tidy up models and controllers.