Below is where the actual changes start. Everything before is just whitespace changes. Let me know if you think a no-whitespace changes pull request would be better