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

Place the . on the previous line, together with the method call receiver.