Refine changes to spf13