refactor vx cs