convert some "single called" functions into lambdas