Tweaked formatting to support other parsers