Lots of little cosmetic cleanups