remove unneeded selectors and use classes in more places