* update * use r1cs std * fix * rem * Apply suggestions from code review Co-authored-by: onewayfunc <onewayfunc@gmail.com>