More Formatting updates