Refactoring fleets CRUD