Semi-finished refactoring