Refactor complex methods
Merge branch 'master' of github.com:aztech-dev/event-dispatcher