Ship creating refactoring