major formatting overhaul