Refactoring....