Added The right usage of lambdas with event listeners