Gear refactoring