Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/393af9e2-08a4-470b-9084-131b13d6a44f

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

Thanks! :)