Stylecop cleanup