No more Lambdas and fewer functions