Revert formatting changes on some non-python files