Changes from Automatic Review

Hey!

These changes are the result of the requested review:
http://jmsyst.com/reviews/707d190a-f797-4d1d-b3c3-f2f81edbceca