Refactoring in progress..