tidy up the views and such