Some styles changes and other stuff

Check out my comments on the individual commits.