Simplify parser and improve rendering.