StyleCop
Merge pull request #5639 from Mailaender/editor-stylecop

Fixed some minor StyleCop issues