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

Space inside square brackets detected.