pull-request-2740

Made some minor source formatting changes on top of Mike's