Make Ryan's suggested changes