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

Unused block argument - `data`. If it's necessary, use `_` or `_data` as an argument name to indicate that it won't be used.