remove lambda functions - it serves no advantage over just using string constants