Solve minor format issues and typos

Change-Id: I9771128f6b7028297c6084ac8e7c651d29fa7762