Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/c10c4a7c-f42f-4b2f-8df1-161a236e0ead