Changes based on Corbin's suggestions.

Didn't know how to make changes to the pull request itself, so I did this.