CS: fix comments + spaces

According to #193, here's the PR that improves spaces and comments in the project.

Feedback and contribution is very welcomed.

Thanks,
is this comment here really needed? If this is a TODO, why not create a ticket?