Added const to some pointers. Updated some long assignment statements to indent 4 per the coding guide. Added explicit calls to Close on the reader and writer objects. Change-Id: I149326c3a07543d7eb9323c702cf13852c5bc3c2