Suggested changes

These changes were recommended by @colinsurprenant