Moved SocketThread to own class
Cleaned up code