minor code format and comment alterations