Restructured and better CssSelector