refactor csw code