Whitespace and doc cleanup

Change-Id: I384a64a2a397533aee5182157c2423ed4e1ac68e