[TASK] Change strategy in Format / Tidy to clean and repair