[FOLD] Address review comments