update on event detail and code cleanup