Refactoring venue
Merge pull request #539 from ChrisBr/venue

Refactoring venue