optimised some lambdas