Minor restructuring of code. Car is now a stand-alone class.