fix and simplify
fix and simplify

pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/pfl,pscedu/slash2-stable,pscedu/pfl,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/pfl,pscedu/pfl