A little cleanup for StyleCop/FxCop