Fix tags and simplify content