Massive formatting updates