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,
not sure the "create if needed" is actually needed here, because by the protocol, that's what declares means