Refactoring in progress...