Refactoring css selectors - part 2.