diff --git a/kal/timer/src/kal.c b/kal/timer/src/kal.c
index 2ee83c4df5302b0e6924c88267fc67bf2406f292..2f4a5b2a8db048fe00217399690b68488e8f3790 100755
--- a/kal/timer/src/kal.c
+++ b/kal/timer/src/kal.c
@@ -143,12 +143,8 @@ KalErrCode KalTimerDelete(KalTimerId timerId)
     }
     KalTimer* tmpPtr = (KalTimer *)timerId;
     int ret = timer_delete(tmpPtr->timerPtr);
-    if (ret != 0) {
-        free(timerId);
-        return KAL_ERR_INNER;
-    }
     free(timerId);
-    return KAL_OK;
+    return (ret != 0) ? KAL_ERR_INNER : KAL_OK;
 }
 
 unsigned int KalTimerIsRunning(KalTimerId timerId)
diff --git a/kv_store/src/kvstore_impl_hal/kv_store.c b/kv_store/src/kvstore_impl_hal/kv_store.c
index 976dbd4c7f1b6b3f69fa974c06dcc72858368259..da22e813354f20457c4aac17aaabc00a92c7555a 100755
--- a/kv_store/src/kvstore_impl_hal/kv_store.c
+++ b/kv_store/src/kvstore_impl_hal/kv_store.c
@@ -40,13 +40,12 @@ static int GetValueByFile(const char* key, char* value, unsigned int len)
     if (fd < 0) {
         return EC_FAILURE;
     }
-    if (UtilsFileRead(fd, value, valueLen) < 0) {
-        UtilsFileClose(fd);
-        return EC_FAILURE;
-    }
+    int ret = UtilsFileRead(fd, value, valueLen);
     UtilsFileClose(fd);
-    value[valueLen] = '\0';
-    return valueLen;
+    if (ret >= 0) {
+        value[valueLen] = '\0';
+    }
+    return (ret < 0) ? EC_FAILURE : valueLen;
 }
 
 static int SetValueToFile(const char* key, const char* value)
@@ -55,12 +54,9 @@ static int SetValueToFile(const char* key, const char* value)
     if (fd < 0) {
         return EC_FAILURE;
     }
-    if (UtilsFileWrite(fd, value, strlen(value)) < 0) {
-        UtilsFileClose(fd);
-        return EC_FAILURE;
-    }
+    int ret = UtilsFileWrite(fd, value, strlen(value));
     UtilsFileClose(fd);
-    return EC_SUCCESS;
+    return (ret < 0) ? EC_FAILURE : EC_SUCCESS;
 }
 
 static int GetCurrentItem(void)
@@ -70,13 +66,9 @@ static int GetCurrentItem(void)
         return 0;
     }
     char value[KV_SUM_INDEX] = {0};
-    if (UtilsFileRead(fd, value, KV_SUM_INDEX) < 0) {
-        UtilsFileClose(fd);
-        return 0;
-    }
+    int ret = UtilsFileRead(fd, value, KV_SUM_INDEX);
     UtilsFileClose(fd);
-    int sum = atoi(value);
-    return sum;
+    return (ret < 0) ? 0 : atoi(value);
 }
 
 static int SetCurrentItem(const int num)
@@ -89,12 +81,9 @@ static int SetCurrentItem(const int num)
     if (fd < 0) {
         return EC_FAILURE;
     }
-    if (UtilsFileWrite(fd, value, KV_SUM_INDEX) < 0) {
-        UtilsFileClose(fd);
-        return EC_FAILURE;
-    }
+    int ret = UtilsFileWrite(fd, value, KV_SUM_INDEX);
     UtilsFileClose(fd);
-    return EC_SUCCESS;
+    return (ret < 0) ? EC_FAILURE : EC_SUCCESS;
 }
 
 static boolean NewItem(const char* key)
@@ -159,10 +148,8 @@ int UtilsDeleteValue(const char* key)
     DeleteKVCache(key);
 #endif
     int ret = UtilsFileDelete(key);
-    int currentNum = GetCurrentItem();
     if (ret == EC_SUCCESS) {
-        currentNum--;
-        ret = SetCurrentItem(currentNum);
+        ret = SetCurrentItem(GetCurrentItem() - 1);
     }
     return ret;
 }