Fix tags, indent and format