PSPReversal: clean up names, code