Changes based on Discussions on PR, removing use of RawTextHelper from examples