Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/2cad7380-8fa6-4791-ac1e-02b584058e11

As they were automatically made, please review them before merging.

Thanks! :)