Tidy up view