Updates to formatting, again, and again