Removed redundant code and used partial.
Tidying up ...
Make sure venue is unique.