[IMP]Fleet: optimize code