Fix ALL the formatting