CS fixes in code
Merge pull request #1672 from peterkokot/patch-2

CS fixes in code