Refactor for CSS