W.E.Browns suggested edits - remove references to raw pointer