Addional refactoring to make class less complex and dry it up

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