Fix StyleCop errors

4 errors left. TODO: Split classes that are in the same file. Rebuild after every single actiongit status