Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/d765895b-ab13-417b-890d-0b3447e201fa

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

Thanks! :)