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

Line is too long. [94/80]<br>Space inside square brackets detected.