Refactoring.........