Fix a bunch of formatting errors