Reverted how Parser.parseRawText(unparsedText) is managed & minor formatting changes