Cleaning and refactoring
New event details - work in progress