Add cleared defintion to css
refactor to make file structure simplier