fix format (phase.2)