Tidy up of Venues app