Fix indentation and tweak comments a bit

Bug: 50859
Change-Id: Ic827e200674fb72b8b88e362bab30662cc13e304