Refactoring refactoring refactoring...