Formatting is MUCH nicer now