improve parser output