[2.3] CS Fixes

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

##### This pull request provides some cs fixes.
That's what I thought. I have a mixed feeling here; we are doing tons of PR about CS changes and it takes a lot of time for everyone to create those PRs, review them and finally merge them. I must admit that I spend too much time on this. So, whenever we fix something, I'd rather do it thoroughly or not. From what I understand, reverting those dots is best thing to do until we have an automated way to fix all of them. What do you think?