Cleaned up some formatting

I have a few more comments on other branches... should have those tonight as well.