Renamed class method, cleaned up socket class.