Even more formatting/restructuring