mod. Formatting fixes.

Change-Id: I0ebb96d3a061cb059f2b3fbba0cbfdf8fcd008b4