[CS] Coding Standard fixes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

> Details make perfection, and perfection is not a detail 
 cit. Leonardo Da Vinci