Cleaned up ship class