Stylecop violations fixed