Cleanup whitespace and comments

Change-Id: I7bd50300ef706aa1482a65983d91dc0aa2f399e3