Working on socket server
Code cleaning
Working on socket server