More quick formatting updates