Cleaned up more format stuff.