Minor cleanup

- remove quote where possible
- remove temporary variables where it makes sense
- use single quote over double quote where possible