Refactoring (remove logging and move event finding method up)