Refactor using CodeRush (cont 2)