Clean up

- finished initial clean-up of legacy code
- we no longer use `..` method of executing commands
- now we use $(..) instead
- various string variables now double quoted