Refactoring half-done