Fixing some more formatting issues