Refactoring fleets controller