diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index ea3d24c..3edd704 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -552,10 +552,13 @@
     ((void) md_alg);
     p = (unsigned char*) sig;
 
-    if( (ret = extract_ecdsa_sig( &p, sig + sig_len, signature, NUM_ECC_BYTES ) ) != 0 )
+    ret = extract_ecdsa_sig( &p, sig + sig_len, signature, NUM_ECC_BYTES );
+    if( ret != 0 )
         return( ret );
 
-    if( (ret = uECC_verify( (uint8_t *) ctx, hash, (unsigned) hash_len, signature, uecc_curve ) ) != 0 )
+    ret = uECC_verify( (uint8_t *) ctx, hash,
+                       (unsigned) hash_len, signature, uecc_curve );
+    if( ret != 0 )
         return( MBEDTLS_ERR_PK_SIG_LEN_MISMATCH );
 
     return( ret );