Refactor Vehicle into a class