tidying up on events index