Refactor CSEigen