fix the schwartz, remove lotsa lambdas