diff --git a/cart-packet-queue.go b/cart-packet-queue.go
index 092f4bb..a906a92 100644
--- a/cart-packet-queue.go
+++ b/cart-packet-queue.go
@@ -18,7 +18,6 @@ const CurrentPacketVersion = 2
 type CartListener map[CartId]Listener
 
 func NewCartPacketQueue(connection *PersistentConnection) *CartPacketQueue {
-
 	queue := &CartPacketQueue{
 		expectedPackages: make(map[CartMessage]*CartListener),
 	}
diff --git a/synced-pool.go b/synced-pool.go
index 385cbf0..e4e49ab 100644
--- a/synced-pool.go
+++ b/synced-pool.go
@@ -128,7 +128,7 @@ func (p *SyncedPool) RemoveRemoteGrain(id CartId) {
 
 func (p *SyncedPool) SpawnRemoteGrain(id CartId, host string) {
 	if p.local.grains[id] != nil {
-		log.Printf("Grain %s already exists locally, deleting\n", id)
+		log.Printf("Grain %s already exists locally, exists on (%s)\n", id, host)
 		p.mu.Lock()
 		delete(p.local.grains, id)
 		p.mu.Unlock()
@@ -395,18 +395,15 @@ func (p *SyncedPool) AddRemote(host string) error {
 	}()
 	go func() {
 		for range time.Tick(time.Second * 3) {
-			var err error
+			err := remote.Ping()
 
-			err = remote.Ping()
-			if err != nil {
-				for err != nil {
-					time.Sleep(time.Millisecond * 200)
-					err = remote.Ping()
-					if remote.MissedPings > 3 {
-						log.Printf("Removing host, unable to communicate with %s", host)
-						p.RemoveHost(&remote)
-						return
-					}
+			for err != nil {
+				time.Sleep(time.Millisecond * 200)
+				err = remote.Ping()
+				if remote.MissedPings > 3 {
+					log.Printf("Removing host, unable to communicate with %s", host)
+					p.RemoveHost(&remote)
+					return
 				}
 			}
 		}