Move ',l' mapping out of function