Additional adjustments to formatting