J.W. got rid of some of the extra lambdas