Reworked formatting a bit