Even more changes to the formatting