Finished StyleCop refactoring