I would do something about the water heater sitting on the garage floor before worrying about making things pretty or there might become something real ugly, where does the combustion air come from for the water heater & what happens with a small gasoline leak onto the floor from one of the cars??