Fix a lot more formatting