Removing unnecessary lambdas, fixing up indentation.