More refactoring by StyleCop advices