Refactoring..