diff --git a/UNITTESTS/stubs/CellularContext_stub.h b/UNITTESTS/stubs/CellularContext_stub.h
index 062f77fdff..e90f405434 100644
--- a/UNITTESTS/stubs/CellularContext_stub.h
+++ b/UNITTESTS/stubs/CellularContext_stub.h
@@ -92,12 +92,12 @@ public:
         return true;
     };
 
-    NetworkStack * get_stack()
+    NetworkStack *get_stack()
     {
         return NULL;
     };
 
-    const char * get_ip_address()
+    const char *get_ip_address()
     {
         return NULL;
     };
@@ -120,7 +120,7 @@ public:
     };
 
     nsapi_error_t connect(const char *sim_pin, const char *apn, const char *uname,
-                                              const char *pwd)
+                          const char *pwd)
     {
         return NSAPI_ERROR_OK;
     };
@@ -130,12 +130,12 @@ public:
 
     };
 
-    const char * get_netmask()
+    const char *get_netmask()
     {
         return NULL;
     };
 
-    const char * get_gateway()
+    const char *get_gateway()
     {
         return NULL;
     };
diff --git a/UNITTESTS/stubs/ControlPlane_netif_stub.h b/UNITTESTS/stubs/ControlPlane_netif_stub.h
index ed4bec917f..52661c52b8 100644
--- a/UNITTESTS/stubs/ControlPlane_netif_stub.h
+++ b/UNITTESTS/stubs/ControlPlane_netif_stub.h
@@ -43,7 +43,7 @@ protected:
 
     virtual nsapi_error_t recv(void *cpdata, nsapi_size_t cpdata_length)
     {
-         if (!return_values.empty()) {
+        if (!return_values.empty()) {
             nsapi_error_t ret = return_values.front();
             return_values.pop_front();
             return ret;
@@ -51,7 +51,7 @@ protected:
         return return_value;
     };
 
-    virtual void data_received(){};
+    virtual void data_received() {};
 
     virtual void attach(void (*callback)(void *), void *data) {};
 };
diff --git a/UNITTESTS/target_h/myCellularDevice.h b/UNITTESTS/target_h/myCellularDevice.h
index 521b3c839f..71097c4a03 100644
--- a/UNITTESTS/target_h/myCellularDevice.h
+++ b/UNITTESTS/target_h/myCellularDevice.h
@@ -52,7 +52,7 @@ public:
     }
 
     virtual CellularContext *create_context(UARTSerial *serial, const char *const apn, PinName dcd_pin,
-                                                   bool active_high, bool cp_req = false, bool nonip_req = false)
+                                            bool active_high, bool cp_req = false, bool nonip_req = false)
     {
         return NULL;
     }
diff --git a/features/netsocket/cellular/CellularNonIPSocket.cpp b/features/netsocket/cellular/CellularNonIPSocket.cpp
index 3806696f19..30bda5390b 100644
--- a/features/netsocket/cellular/CellularNonIPSocket.cpp
+++ b/features/netsocket/cellular/CellularNonIPSocket.cpp
@@ -233,12 +233,12 @@ nsapi_error_t CellularNonIPSocket::listen(int backlog)
 }
 
 nsapi_size_or_error_t CellularNonIPSocket::sendto(const SocketAddress &address,
-                                     const void *data, nsapi_size_t size)
+                                                  const void *data, nsapi_size_t size)
 {
     return NSAPI_ERROR_UNSUPPORTED;
 }
 nsapi_size_or_error_t CellularNonIPSocket::recvfrom(SocketAddress *address,
-                                       void *data, nsapi_size_t size)
+                                                    void *data, nsapi_size_t size)
 {
     return NSAPI_ERROR_UNSUPPORTED;
 }