Post-refactoring refactor