Yes. That would be better and can be easily parse by exploding the first header on whitespace.