Fixed printouts to parse-friendly format