Small refactoring, using -n for csi.