Changes suggested by StyleCop