Refactor CSS II