Refactoring fleet detail