Tidied up ship navigation code and made ship's members to private