Whitespace and comment cleanup

Change-Id: Icfa1484e1e522686689976780498dfa8e322b9de