[minor] rewrite wnf
Merge after rewrite wnf