Consolidate to one formatting standard