Simplified parser to more compact form