Improve Zen parser performance

Reduced usage of regex