Tidy up views