Change position of event triggers

Event triggers should be at the end of each method.
Small refactoring - noop, returnFalse