<1> removing stringstreams and working directly on strings
<2> incorporating Code review changes.