General formatting updates