Refactoring fleet form