formatting overhaul