refactor & clean SYSO