diff --git a/library/net_sockets.c b/library/net_sockets.c
index 17a9e4a..fc4024e 100644
--- a/library/net_sockets.c
+++ b/library/net_sockets.c
@@ -123,7 +123,7 @@
     if( wsa_init_done == 0 )
     {
         if( WSAStartup( MAKEWORD(2,0), &wsaData ) != 0 )
-            return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+            return MBEDTLS_ERR_NET_SOCKET_FAILED ;
 
         wsa_init_done = 1;
     }
@@ -132,7 +132,7 @@
     signal( SIGPIPE, SIG_IGN );
 #endif
 #endif
-    return( 0 );
+    return 0 ;
 }
 
 /*
@@ -143,7 +143,7 @@
 static int check_fd( int fd, int for_select )
 {
     if( fd < 0 )
-        return( MBEDTLS_ERR_NET_INVALID_CONTEXT );
+        return MBEDTLS_ERR_NET_INVALID_CONTEXT ;
 
 #if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \
     !defined(EFI32)
@@ -154,10 +154,10 @@
      * fd_set type. Error out early, because attempting to call FD_SET on a
      * large file descriptor is a buffer overflow on typical platforms. */
     if( for_select && fd >= FD_SETSIZE )
-        return( MBEDTLS_ERR_NET_POLL_FAILED );
+        return MBEDTLS_ERR_NET_POLL_FAILED ;
 #endif
 
-    return( 0 );
+    return 0 ;
 }
 
 /*
@@ -178,7 +178,7 @@
     struct addrinfo hints, *addr_list, *cur;
 
     if( ( ret = net_prepare() ) != 0 )
-        return( ret );
+        return ret ;
 
     /* Do name resolution with both IPv6 and IPv4 */
     memset( &hints, 0, sizeof( hints ) );
@@ -187,7 +187,7 @@
     hints.ai_protocol = proto == MBEDTLS_NET_PROTO_UDP ? IPPROTO_UDP : IPPROTO_TCP;
 
     if( getaddrinfo( host, port, &hints, &addr_list ) != 0 )
-        return( MBEDTLS_ERR_NET_UNKNOWN_HOST );
+        return MBEDTLS_ERR_NET_UNKNOWN_HOST ;
 
     /* Try the sockaddrs until a connection succeeds */
     ret = MBEDTLS_ERR_NET_UNKNOWN_HOST;
@@ -213,7 +213,7 @@
 
     freeaddrinfo( addr_list );
 
-    return( ret );
+    return ret ;
 }
 
 /*
@@ -225,7 +225,7 @@
     struct addrinfo hints, *addr_list, *cur;
 
     if( ( ret = net_prepare() ) != 0 )
-        return( ret );
+        return ret ;
 
     /* Bind to IPv6 and/or IPv4, but only in the desired protocol */
     memset( &hints, 0, sizeof( hints ) );
@@ -236,7 +236,7 @@
         hints.ai_flags = AI_PASSIVE;
 
     if( getaddrinfo( bind_ip, port, &hints, &addr_list ) != 0 )
-        return( MBEDTLS_ERR_NET_UNKNOWN_HOST );
+        return MBEDTLS_ERR_NET_UNKNOWN_HOST ;
 
     /* Try the sockaddrs until a binding succeeds */
     ret = MBEDTLS_ERR_NET_UNKNOWN_HOST;
@@ -284,7 +284,7 @@
 
     freeaddrinfo( addr_list );
 
-    return( ret );
+    return ret ;
 
 }
 
@@ -297,7 +297,7 @@
 static int net_would_block( const mbedtls_net_context *ctx )
 {
     ((void) ctx);
-    return( WSAGetLastError() == WSAEWOULDBLOCK );
+    return WSAGetLastError() == WSAEWOULDBLOCK ;
 }
 #else
 /*
@@ -316,7 +316,7 @@
     if( ( fcntl( ctx->fd, F_GETFL ) & O_NONBLOCK ) != O_NONBLOCK )
     {
         errno = err;
-        return( 0 );
+        return 0 ;
     }
 
     switch( errno = err )
@@ -327,9 +327,9 @@
 #if defined EWOULDBLOCK && EWOULDBLOCK != EAGAIN
         case EWOULDBLOCK:
 #endif
-            return( 1 );
+            return 1 ;
     }
-    return( 0 );
+    return 0 ;
 }
 #endif /* ( _WIN32 || _WIN32_WCE ) && !EFIX64 && !EFI32 */
 
@@ -360,7 +360,7 @@
                     (void *) &type, &type_len ) != 0 ||
         ( type != SOCK_STREAM && type != SOCK_DGRAM ) )
     {
-        return( MBEDTLS_ERR_NET_ACCEPT_FAILED );
+        return MBEDTLS_ERR_NET_ACCEPT_FAILED ;
     }
 
     if( type == SOCK_STREAM )
@@ -390,9 +390,9 @@
     if( ret < 0 )
     {
         if( net_would_block( bind_ctx ) != 0 )
-            return( MBEDTLS_ERR_SSL_WANT_READ );
+            return MBEDTLS_ERR_SSL_WANT_READ ;
 
-        return( MBEDTLS_ERR_NET_ACCEPT_FAILED );
+        return MBEDTLS_ERR_NET_ACCEPT_FAILED ;
     }
 
     /* UDP: hijack the listening socket to communicate with the client,
@@ -403,7 +403,7 @@
         int one = 1;
 
         if( connect( bind_ctx->fd, (struct sockaddr *) &client_addr, n ) != 0 )
-            return( MBEDTLS_ERR_NET_ACCEPT_FAILED );
+            return MBEDTLS_ERR_NET_ACCEPT_FAILED ;
 
         client_ctx->fd = bind_ctx->fd;
         bind_ctx->fd   = -1; /* In case we exit early */
@@ -416,12 +416,12 @@
             setsockopt( bind_ctx->fd, SOL_SOCKET, SO_REUSEADDR,
                         (const char *) &one, sizeof( one ) ) != 0 )
         {
-            return( MBEDTLS_ERR_NET_SOCKET_FAILED );
+            return MBEDTLS_ERR_NET_SOCKET_FAILED ;
         }
 
         if( bind( bind_ctx->fd, (struct sockaddr *) &local_addr, n ) != 0 )
         {
-            return( MBEDTLS_ERR_NET_BIND_FAILED );
+            return MBEDTLS_ERR_NET_BIND_FAILED ;
         }
     }
 
@@ -433,7 +433,7 @@
             *ip_len = sizeof( addr4->sin_addr.s_addr );
 
             if( buf_size < *ip_len )
-                return( MBEDTLS_ERR_NET_BUFFER_TOO_SMALL );
+                return MBEDTLS_ERR_NET_BUFFER_TOO_SMALL ;
 
             memcpy( client_ip, &addr4->sin_addr.s_addr, *ip_len );
         }
@@ -443,13 +443,13 @@
             *ip_len = sizeof( addr6->sin6_addr.s6_addr );
 
             if( buf_size < *ip_len )
-                return( MBEDTLS_ERR_NET_BUFFER_TOO_SMALL );
+                return MBEDTLS_ERR_NET_BUFFER_TOO_SMALL ;
 
             memcpy( client_ip, &addr6->sin6_addr.s6_addr, *ip_len);
         }
     }
 
-    return( 0 );
+    return 0 ;
 }
 
 /*
@@ -460,9 +460,9 @@
 #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
     !defined(EFI32)
     u_long n = 0;
-    return( ioctlsocket( ctx->fd, FIONBIO, &n ) );
+    return ioctlsocket( ctx->fd, FIONBIO, &n ) ;
 #else
-    return( fcntl( ctx->fd, F_SETFL, fcntl( ctx->fd, F_GETFL ) & ~O_NONBLOCK ) );
+    return fcntl( ctx->fd, F_SETFL, fcntl( ctx->fd, F_GETFL ) & ~O_NONBLOCK ) ;
 #endif
 }
 
@@ -471,9 +471,9 @@
 #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
     !defined(EFI32)
     u_long n = 1;
-    return( ioctlsocket( ctx->fd, FIONBIO, &n ) );
+    return ioctlsocket( ctx->fd, FIONBIO, &n ) ;
 #else
-    return( fcntl( ctx->fd, F_SETFL, fcntl( ctx->fd, F_GETFL ) | O_NONBLOCK ) );
+    return fcntl( ctx->fd, F_SETFL, fcntl( ctx->fd, F_GETFL ) | O_NONBLOCK ) ;
 #endif
 }
 
@@ -493,7 +493,7 @@
 
     ret = check_fd( fd, 1 );
     if( ret != 0 )
-        return( ret );
+        return ret ;
 
 #if defined(__has_feature)
 #if __has_feature(memory_sanitizer)
@@ -520,7 +520,7 @@
     }
 
     if( rw != 0 )
-        return( MBEDTLS_ERR_NET_BAD_INPUT_DATA );
+        return MBEDTLS_ERR_NET_BAD_INPUT_DATA ;
 
     tv.tv_sec  = timeout / 1000;
     tv.tv_usec = ( timeout % 1000 ) * 1000;
@@ -533,7 +533,7 @@
     while( IS_EINTR( ret ) );
 
     if( ret < 0 )
-        return( MBEDTLS_ERR_NET_POLL_FAILED );
+        return MBEDTLS_ERR_NET_POLL_FAILED ;
 
     ret = 0;
     if( FD_ISSET( fd, &read_fds ) )
@@ -541,7 +541,7 @@
     if( FD_ISSET( fd, &write_fds ) )
         ret |= MBEDTLS_NET_POLL_WRITE;
 
-    return( ret );
+    return ret ;
 }
 
 /*
@@ -574,31 +574,31 @@
 
     ret = check_fd( fd, 0 );
     if( ret != 0 )
-        return( ret );
+        return ret ;
 
     ret = (int) read( fd, buf, len );
 
     if( ret < 0 )
     {
         if( net_would_block( ctx ) != 0 )
-            return( MBEDTLS_ERR_SSL_WANT_READ );
+            return MBEDTLS_ERR_SSL_WANT_READ ;
 
 #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
     !defined(EFI32)
         if( WSAGetLastError() == WSAECONNRESET )
-            return( MBEDTLS_ERR_NET_CONN_RESET );
+            return MBEDTLS_ERR_NET_CONN_RESET ;
 #else
         if( errno == EPIPE || errno == ECONNRESET )
-            return( MBEDTLS_ERR_NET_CONN_RESET );
+            return MBEDTLS_ERR_NET_CONN_RESET ;
 
         if( errno == EINTR )
-            return( MBEDTLS_ERR_SSL_WANT_READ );
+            return MBEDTLS_ERR_SSL_WANT_READ ;
 #endif
 
-        return( MBEDTLS_ERR_NET_RECV_FAILED );
+        return MBEDTLS_ERR_NET_RECV_FAILED ;
     }
 
-    return( ret );
+    return ret ;
 }
 
 /*
@@ -614,7 +614,7 @@
 
     ret = check_fd( fd, 1 );
     if( ret != 0 )
-        return( ret );
+        return ret ;
 
     FD_ZERO( &read_fds );
     FD_SET( fd, &read_fds );
@@ -626,24 +626,24 @@
 
     /* Zero fds ready means we timed out */
     if( ret == 0 )
-        return( MBEDTLS_ERR_SSL_TIMEOUT );
+        return MBEDTLS_ERR_SSL_TIMEOUT ;
 
     if( ret < 0 )
     {
 #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
     !defined(EFI32)
         if( WSAGetLastError() == WSAEINTR )
-            return( MBEDTLS_ERR_SSL_WANT_READ );
+            return MBEDTLS_ERR_SSL_WANT_READ ;
 #else
         if( errno == EINTR )
-            return( MBEDTLS_ERR_SSL_WANT_READ );
+            return MBEDTLS_ERR_SSL_WANT_READ ;
 #endif
 
-        return( MBEDTLS_ERR_NET_RECV_FAILED );
+        return MBEDTLS_ERR_NET_RECV_FAILED ;
     }
 
     /* This call will not block */
-    return( mbedtls_net_recv( ctx, buf, len ) );
+    return mbedtls_net_recv( ctx, buf, len ) ;
 }
 
 /*
@@ -656,31 +656,31 @@
 
     ret = check_fd( fd, 0 );
     if( ret != 0 )
-        return( ret );
+        return ret ;
 
     ret = (int) write( fd, buf, len );
 
     if( ret < 0 )
     {
         if( net_would_block( ctx ) != 0 )
-            return( MBEDTLS_ERR_SSL_WANT_WRITE );
+            return MBEDTLS_ERR_SSL_WANT_WRITE ;
 
 #if ( defined(_WIN32) || defined(_WIN32_WCE) ) && !defined(EFIX64) && \
     !defined(EFI32)
         if( WSAGetLastError() == WSAECONNRESET )
-            return( MBEDTLS_ERR_NET_CONN_RESET );
+            return MBEDTLS_ERR_NET_CONN_RESET ;
 #else
         if( errno == EPIPE || errno == ECONNRESET )
-            return( MBEDTLS_ERR_NET_CONN_RESET );
+            return MBEDTLS_ERR_NET_CONN_RESET ;
 
         if( errno == EINTR )
-            return( MBEDTLS_ERR_SSL_WANT_WRITE );
+            return MBEDTLS_ERR_SSL_WANT_WRITE ;
 #endif
 
-        return( MBEDTLS_ERR_NET_SEND_FAILED );
+        return MBEDTLS_ERR_NET_SEND_FAILED ;
     }
 
-    return( ret );
+    return ret ;
 }
 
 /*