Some more formatting updates