diff --git a/library/ecp.c b/library/ecp.c
index 4c7cdbf..ece781d 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -495,7 +495,7 @@
     int ret;
     size_t plen;
 
-    if ( ilen < 1 )
+    if( ilen < 1 )
         return( POLARSSL_ERR_ECP_BAD_INPUT_DATA );
 
     if( buf[0] == 0x00 )
diff --git a/library/net.c b/library/net.c
index ec56800..3f0e448 100644
--- a/library/net.c
+++ b/library/net.c
@@ -497,8 +497,8 @@
 {
     struct timeval tv;
     tv.tv_sec  = 0;
-#if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || \
-    (defined(__APPLE__) && defined(__MACH__)))
+#if !defined(_WIN32) && ( defined(__unix__) || defined(__unix) || \
+    ( defined(__APPLE__) && defined(__MACH__) ) )
     tv.tv_usec = (suseconds_t) usec;
 #else
     tv.tv_usec = usec;
diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c
index b05b8dd..7907980 100644
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@@ -260,7 +260,7 @@
     TLS_PSK_WITH_NULL_SHA256,
     TLS_PSK_WITH_NULL_SHA,
 
-#endif
+#endif /* SSL_CIPHERSUITES */
     0
 };
 
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index eba2374..5f080de 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3338,7 +3338,7 @@
             (ssl_session *) polarssl_malloc( sizeof(ssl_session) );
     }
 
-    if( ssl->handshake == NULL)
+    if( ssl->handshake == NULL )
     {
         ssl->handshake = (ssl_handshake_params *)
             polarssl_malloc( sizeof(ssl_handshake_params) );