Use lambdas to remove references to Function