Just some standardizing (as per #7)