More formatting updates, making the code pretty