Refactored several methods in both Automobie & OptionSet