refactor of CSS complete