Refactor Client & Socket