Stylecop cleanup
Stylecop cleanup