cleanup: minimize use of lambda expressions - we have 'def' for that purpose Fix some flake8 warnings "E731 do not assign a lambda expression, use a def".