Tidied up Venue but yet to do api side of it.