Pre-refactoring