Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/f73304aa-0171-46f6-8c1b-925cb1d3e5f8