improve selectors & css rules