Changes

I will leave comments in the Diff in regards to other parts I just disagree with.
I also prefer no spaces, but didn't feel super strongly about it.