Refactoring (again)