Replaced a bunch of lambdas with method references