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,
Ticket doesn't travel with the code. IDEs parse @todo, @fixme or KLUDGE. I think it's best to have this wrapped into the code so the next person who work on this code snippet will try to improve it.