CS fixes

These are some Coding Standards fixes for you PR. I did not changed any behavior, I just fixed the CS issues.

**Note:** The long list of changed files is because your branch is outdated.