removal of use of lambdas