Refactoring fleet view