Double quote with vars and simple without vars

To see the changes se the commit "Double quote with vars and simple without vars".

The "Retab" commit only change the "tab's" for spaces