Fix the formatting (using the formatting support which is in-progress)