Format & Fix