Additional DOM simplification