FXCop-based refactoring