more cleanup CSS org