GearSwap - Further refactoring