Refactor ship class, somewhat