white space, comments, and alignment perfectionism

Change-Id: Ie7bd0fce8bfe60aa1139de55d51c22196cb325ae