GearSwap - refactoring