Minor formatting fixes

Change-Id: If781081ba95ec626f7d0a927e9ee16114f1a96cd