css Class refactor