Huge formatting overhaul