formatting cleanup
misc formatting updates