Finish refactoring refactoring...