Refactoring register fleets