Refactoring fleets form