A few simple changes

I took the majority of my changes from my last pull request and implemented them without changing the format of the files.