continued to refactor cascade class