Started using pyparsing instead of direct regex