diff --git a/wolfcrypt/src/sp_int.c b/wolfcrypt/src/sp_int.c
index a8227242d..600a90fd6 100644
--- a/wolfcrypt/src/sp_int.c
+++ b/wolfcrypt/src/sp_int.c
@@ -2863,8 +2863,8 @@ int sp_cmp_d(sp_int* a, sp_int_digit d)
  * @param  [in]   d  Digit to add.
  * @param  [out]  r  SP integer to store result in.
  *
- * @returnn  MP_OKAY on success.
- * @returnn  MP_VAL when result is too large for fixed size dp array.
+ * @return  MP_OKAY on success.
+ * @return  MP_VAL when result is too large for fixed size dp array.
  */
 static int _sp_add_d(sp_int* a, sp_int_digit d, sp_int* r)
 {
@@ -2955,8 +2955,8 @@ static void _sp_sub_d(sp_int* a, sp_int_digit d, sp_int* r)
  * @param  [in]   d  Digit to add.
  * @param  [out]  r  SP integer to store result in.
  *
- * @returnn  MP_OKAY on success.
- * @returnn  MP_VAL when result is too large for fixed size dp array.
+ * @return  MP_OKAY on success.
+ * @return  MP_VAL when result is too large for fixed size dp array.
  */
 int sp_add_d(sp_int* a, sp_int_digit d, sp_int* r)
 {
@@ -2997,8 +2997,8 @@ int sp_add_d(sp_int* a, sp_int_digit d, sp_int* r)
  * @param  [in]   d  Digit to subtract.
  * @param  [out]  r  SP integer to store result in.
  *
- * @returnn  MP_OKAY on success.
- * @returnn  MP_VAL when a or r is NULL.
+ * @return  MP_OKAY on success.
+ * @return  MP_VAL when a or r is NULL.
  */
 int sp_sub_d(sp_int* a, sp_int_digit d, sp_int* r)
 {
@@ -5294,7 +5294,6 @@ int sp_mod(sp_int* a, sp_int* m, sp_int* r)
             t->dp[13] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_MUL_ADD_NO(l, h, a->dp[7], b->dp[7]);
             t->dp[14] = l;
             t->dp[15] = h;
@@ -5575,7 +5574,6 @@ int sp_mod(sp_int* a, sp_int* m, sp_int* r)
             t->dp[21] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_MUL_ADD_NO(l, h, a->dp[11], b->dp[11]);
             t->dp[22] = l;
             t->dp[23] = h;
@@ -6002,7 +6000,6 @@ int sp_mod(sp_int* a, sp_int* m, sp_int* r)
             t->dp[29] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_MUL_ADD_NO(l, h, a->dp[15], b->dp[15]);
             t->dp[30] = l;
             t->dp[31] = h;
@@ -6810,7 +6807,6 @@ int sp_mod(sp_int* a, sp_int* m, sp_int* r)
             t->dp[45] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_MUL_ADD_NO(l, h, a->dp[23], b->dp[23]);
             t->dp[46] = l;
             t->dp[47] = h;
@@ -9973,7 +9969,6 @@ int sp_mul_2d(sp_int* a, int e, sp_int* r)
             t->dp[13] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_SQR_ADD_NO(l, h, a->dp[7]);
             t->dp[14] = l;
             t->dp[15] = h;
@@ -10207,7 +10202,6 @@ int sp_mul_2d(sp_int* a, int e, sp_int* r)
             t->dp[21] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_SQR_ADD_NO(l, h, a->dp[11]);
             t->dp[22] = l;
             t->dp[23] = h;
@@ -10541,7 +10535,6 @@ int sp_mul_2d(sp_int* a, int e, sp_int* r)
             t->dp[29] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_SQR_ADD_NO(l, h, a->dp[15]);
             t->dp[30] = l;
             t->dp[31] = h;
@@ -11116,7 +11109,6 @@ int sp_mul_2d(sp_int* a, int e, sp_int* r)
             t->dp[45] = l;
             l = h;
             h = o;
-            o = 0;
             SP_ASM_SQR_ADD_NO(l, h, a->dp[23]);
             t->dp[46] = l;
             t->dp[47] = h;