further optimizations and better documentation for engineering parser