Format refactor
Format refactor