Edits and format fixes

Change-Id: I0dfc92329c228501c81fa6b207e126c4920114b2