Clean up whitespace between code and comments

Two or more spaces -> one space.

Change-Id: Iee357febf33a8a045ced6375f7003735d750ca76