Refactored the way I'm handling images for events.