Cleanup

You'll want to diff this with something that ignores whitespace changes, I imagine....