Made Scott's suggested changes

Made all those changes except for the one I didn't make