Fix all the formatting