ShipProperties refactoring