Refactor SPPF.