Fixed ship constructor and streamlined code