Refactor Fish & Ship