Refactor using CodeRush (cont)