refactored events index