Clean up more formatting issues