refactoring. also, added less
Merge branch 'master' of github.com:sootn/L3-Eventboard