Cleanups of whitespace and docs

Change-Id: I921ccdad3ebcb732e8235ab5e24eb190815da064