Clean up more formatting