Fix tag mismatches; reformat