refactored events index
refactored and added comments
Merge branch 'master' into github