Refactors, some stuff that never made it up but is already on Heroku.

Space inside square brackets detected.<br>Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.