Cleanup: use lambdas and method references