Updates to formatting, again