refactored some simple ship stuff