Refactor SFC CSIT Variables