Create regex only once, create query only once per parser instance
Minor clean up
Minor optimization hacks