Fixes up some formatting for two-phase