make Kelly's suggested changes