MASSIVE formatting cleanups.