More formatting fixes
Fix tag formatting