took out some unnecessary lambdas