minor cleanup 

removed approx. a quarter of parsing and code-gen. hope you like the style