Refactor Motorcycle class.