Not many changes, just some code clean up and parser optimizations