Use lambda in define
Minor cleanup of functions
String literals