[CLEANUP] Clean up the quoting of strings.

- Use single quotes when double quotes are not necessary.

- Use concatenation instead of embedded variables in strings.
Merge pull request #34 from jjriv/cleanup/single-quoted-strings

[CLEANUP] Clean up the quoting of strings.