More formatting updates