Refactor code from psppire.c