Massive formatting and cleanup