Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/a2639f3e-3201-40b7-8c85-d7dc5675b11f

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

Thanks! :)