Refactoring suggestions
Merge pull request #1 from mhevery/feedback-event-handler

Refactoring suggestions