Cleanup whitespace and documentation

Change-Id: I001c1a9800ec5ce17a774883918d0690f405ed85