Fix not working, and refactor

:(
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.