[FOLD] code review changes