Comments and whitespace fixes