Spare refactoring