further cleanup of CSS