Swapped in a Lang expression parser
cleaning up