Minor: whitespace, comment, formatting fixes.

Change-Id: I3e39d75e5ccc289f8c29a507fd82225c58e7b530