Suggested changes by @neggro, CarGas is going to be a beautiful app
fix conflicts