sort some stylecop issues