Fixed stylecop+ errors