REFACTOR: adressing @bthirion's oral remarks about the lambda (no more lambdas in modules)