CS fixes

- [x] revert few corrections ( space before `?` and removed comment empty line).

this PR is dedicated to @pborreli :)