Correct the grammatical mistakes in the following text.
All things considered we might conclude that public transport will eventually disappear in the short term and in no time everyone will be driving their own clean-energy-driven flying cars to go everywhere.
All things considered, we might conclude that public transport will eventually disappear and, in no time, everyone will be driving their own clean-energy-driven flying cars to go everywhere.