Fix formatting for real v2.0