Format updates

More formatting updates