refactoring-2