Upcoming events tidying