Improve Semantics, simplify styles