Double quote with vars and simple without vars

To see the changes, take a look to "Double quote with vars and simple without vars".

The "Retab" commit only change the "tab's" for spaces