StyleCop cleanup