Simplify DOM structure