Made a few suggested changes