diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c
index 045311bb..83a35095 100644
--- a/sesman/scp_v0.c
+++ b/sesman/scp_v0.c
@@ -31,10 +31,10 @@
 void DEFAULT_CC 
 scp_v0_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
 {
-  int display=0;
+  int display = 0;
   long data;
   struct session_item* s_item;
-      
+
   data = auth_userpass(s->username, s->password);
 
   if (data)
diff --git a/sesman/scp_v1.c b/sesman/scp_v1.c
index 3bf3343d..d2018da5 100644
--- a/sesman/scp_v1.c
+++ b/sesman/scp_v1.c
@@ -33,7 +33,7 @@
 extern struct config_sesman g_cfg;
 
 /******************************************************************************/
-void DEFAULT_CC 
+void DEFAULT_CC
 scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
 {
   long data;
@@ -46,77 +46,82 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
   int scount;
   SCP_SID sid;
 
-  retries=g_cfg.sec.login_retry;
-  current_try=retries;
+  retries = g_cfg.sec.login_retry;
+  current_try = retries;
 
-  data=auth_userpass(s->username, s->password);
+  data = auth_userpass(s->username, s->password);
   LOG_DBG("user: %s\npass: %s", s->username, s->password);
-    
-  while ((!data) && ((retries==0) || (current_try>0)))
+
+  while ((!data) && ((retries == 0) || (current_try > 0)))
   {
-    LOG_DBG("data %d - retry %d - currenttry %d - expr %d", data, retries, current_try, ((!data) && ((retries==0) || (current_try>0))));
-    
-    e=scp_v1s_request_password(c,s,"Wrong username and/or password");
-    
+    LOG_DBG("data %d - retry %d - currenttry %d - expr %d", data, retries,
+            current_try, ((!data) && ((retries == 0) || (current_try > 0))));
+
+    e = scp_v1s_request_password(c, s, "Wrong username and/or password");
+
     switch (e)
     {
       case SCP_SERVER_STATE_OK:
         /* all ok, we got new username and password */
-        data=auth_userpass(s->username, s->password);
+        data = auth_userpass(s->username, s->password);
         /* one try less */ 
-        if (current_try>0)
+        if (current_try > 0)
         {
           current_try--;
         }
         break;
       case SCP_SERVER_STATE_VERSION_ERR:
-        LOG_DBG("version error",0)
+        LOG_DBG("version error", 0)
       case SCP_SERVER_STATE_SIZE_ERR:
         /* an unknown scp version was requested, so we shut down the */ 
         /* connection (and log the fact)                             */ 
-        log_message(LOG_LEVEL_WARNING,"protocol violation. connection closed.");
+        log_message(LOG_LEVEL_WARNING,
+          "protocol violation. connection closed.");
         return;
       case SCP_SERVER_STATE_NETWORK_ERR:
-        log_message(LOG_LEVEL_WARNING,"libscp network error.");
+        log_message(LOG_LEVEL_WARNING, "libscp network error.");
         return;
       case SCP_SERVER_STATE_SEQUENCE_ERR:
-        log_message(LOG_LEVEL_WARNING,"libscp sequence error.");
+        log_message(LOG_LEVEL_WARNING, "libscp sequence error.");
         return;
       case SCP_SERVER_STATE_INTERNAL_ERR:
         /* internal error occurred (eg. malloc() error, ecc.) */
         log_message(LOG_LEVEL_ERROR, "libscp internal error occurred.");
-	return;
+        return;
       default:
         /* dummy: scp_v1s_request_password won't generate any other */
         /* error other than the ones before                         */
-        log_message(LOG_LEVEL_ALWAYS, "unknown return from scp_v1s_request_password()");
-	return;
+        log_message(LOG_LEVEL_ALWAYS,
+          "unknown return from scp_v1s_request_password()");
+        return;
     }
   }
 
   if (!data)
   {
-    scp_v1s_deny_connection(c,"Login failed");
-    log_message(LOG_LEVEL_INFO,"Login failed for user %s. Connection terminated", s->username);
+    scp_v1s_deny_connection(c, "Login failed");
+    log_message(LOG_LEVEL_INFO,
+      "Login failed for user %s. Connection terminated", s->username);
     free_session(s);
     return;
   }
 
   /* testing if login is allowed*/	
-  if (0==access_login_allowed(s->username))
+  if (0 == access_login_allowed(s->username))
   {
-    scp_v1s_deny_connection(c,"Access to Terminal Server not allowed.");
-    log_message(LOG_LEVEL_INFO,"User %s not allowed on TS. Connection terminated", s->username);
+    scp_v1s_deny_connection(c, "Access to Terminal Server not allowed.");
+    log_message(LOG_LEVEL_INFO,
+      "User %s not allowed on TS. Connection terminated", s->username);
     free_session(s);
     return;
   }
-  
+
   //check if we need password change
-  
+
   /* list disconnected sessions */
-  slist=session_get_byuser(s->username, &scount);
+  slist = session_get_byuser(s->username, &scount);
 
-  if (scount==0)
+  if (scount == 0)
   {
 #warning FIXME we should check for MaxSessions
     /* no disconnected sessions - start a new one */
@@ -124,45 +129,46 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
     if (SCP_SESSION_TYPE_XVNC == s->type)
     {
       log_message(LOG_LEVEL_INFO, "starting Xvnc session...");
-      display = session_start(s->width, s->height, s->bpp, s->username, s->password,
-                              data, SESMAN_SESSION_TYPE_XVNC);
+      display = session_start(s->width, s->height, s->bpp, s->username,
+                              s->password, data, SESMAN_SESSION_TYPE_XVNC);
     }
     else
     {
       log_message(LOG_LEVEL_INFO, "starting Xrdp session...");
-      display = session_start(s->width, s->height, s->bpp, s->username, s->password,
-                              data, SESMAN_SESSION_TYPE_XRDP);
+      display = session_start(s->width, s->height, s->bpp, s->username,
+                              s->password, data, SESMAN_SESSION_TYPE_XRDP);
     }
-    
-    e=scp_v1s_connect_new_session(c, display);
+
+    e = scp_v1s_connect_new_session(c, display);
     switch (e)
     {
       case SCP_SERVER_STATE_OK:
         /* all ok, we got new username and password */
         break;
       case SCP_SERVER_STATE_NETWORK_ERR:
-        log_message(LOG_LEVEL_WARNING,"libscp network error.");
+        log_message(LOG_LEVEL_WARNING, "libscp network error.");
         return;
       default:
 	return;
     }
   }
-  else if (scount==1)
+  else if (scount == 1)
   {
     /* there's only one session - returning that */
-    sitem=session_get_bypid(slist->SID);
+    sitem = session_get_bypid(slist->SID);
 #warning FIXME session_get_by*() should return a malloc()ated struct
 #warning FIXME or at least lock the chain
-    if (0==sitem)
+    if (0 == sitem)
     {
-      e=scp_v1s_connection_error(c, "Internal error");
+      e = scp_v1s_connection_error(c, "Internal error");
       log_message(LOG_LEVEL_INFO, "Cannot find session item on the chain");
     }
     else
     {
-      display=sitem->display;
-      e=scp_v1s_reconnect_session(c, slist, display);
-      log_message(LOG_LEVEL_INFO, "User %s reconnected to session %d on port %d", \
+      display = sitem->display;
+      e = scp_v1s_reconnect_session(c, slist, display);
+      log_message(LOG_LEVEL_INFO,
+                  "User %s reconnected to session %d on port %d",
                   s->username, sitem->pid, display);
     }
     g_free(slist);
@@ -170,21 +176,20 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
   else
   {
     /* 2 or more disconnected sessions - listing */
-	  
     //max session x packet = 100 => pkt size = 1300 (13x100)
-    e=scp_v1s_list_sessions(c, scount, slist, &sid);
+    e = scp_v1s_list_sessions(c, scount, slist, &sid);
 
     //CHECK RETURN
- 
+
     g_free(slist);
   }
 
   /* resource management */
-  if ((e==SCP_SERVER_STATE_OK) && (s->rsr))
+  if ((e == SCP_SERVER_STATE_OK) && (s->rsr))
   {
     /* here goes scp resource sharing code */
   }
-  
+
   /* cleanup */ 
   free_session(s);
   auth_end(data);