tidy up models and presenters