Refactoring.....