Made some of the suggested changes