fix and format