Removed debug code
Utilized global event module in helper