Cleaned up code on event scope