Stylecop issues fixed