Cleaned up connecting.