Final formatting updates