CS: fix comments + spaces
Merge pull request #197 from eexit/cs-comments-spaces

CS: fix comments + spaces