diff --git a/go/receive.go b/go/receive.go
index b09eae1..db8bbce 100644
--- a/go/receive.go
+++ b/go/receive.go
@@ -38,20 +38,16 @@ func main() {
 	failOnError(err, "Failed to register a consumer")
 
 	done := make(chan bool)
-	var d amqp.Delivery
 
 	go func() {
-		for d = range msgs {
+		for d := range msgs {
 			log.Printf("Received a message: %s", d.Body)
 			done <- true
 		}
 	}()
 
 	log.Printf(" [*] Waiting for messages. To exit press CTRL+C")
-	select {
-	case <-done:
-		break
-	}
+	<-done
 	log.Printf("Done")
 
 	os.Exit(0)
diff --git a/go/receive_logs.go b/go/receive_logs.go
index 0bd911c..7874839 100644
--- a/go/receive_logs.go
+++ b/go/receive_logs.go
@@ -43,20 +43,16 @@ func main() {
 	msgs, err := ch.Consume(q.Name, "", true, false, false, false, nil)
 
 	done := make(chan bool)
-	var d amqp.Delivery
 
 	go func() {
-		for d = range msgs {
+		for d := range msgs {
 			log.Printf(" [x] %s", d.Body)
 			done <- true
 		}
 	}()
 
 	log.Printf(" [*] Waiting for logs. To exit press CTRL+C")
-	select {
-	case <-done:
-		break
-	}
+	<-done
 	log.Printf("Done")
 
 	os.Exit(0)
diff --git a/go/receive_logs_direct.go b/go/receive_logs_direct.go
index ef2c715..ff657e3 100644
--- a/go/receive_logs_direct.go
+++ b/go/receive_logs_direct.go
@@ -43,8 +43,7 @@ func main() {
 	)
 	failOnError(err, "Failed to declare a queue")
 
-	var s string
-	for _, s = range os.Args {
+	for _, s := range os.Args {
 		log.Printf("Binding queue %s to exchange %s with routing key %s", q.Name, "logs_direct", s)
 		err = ch.QueueBind(
 			q.Name,        // queue name
@@ -58,20 +57,16 @@ func main() {
 	msgs, err := ch.Consume(q.Name, "", true, false, false, false, nil)
 
 	done := make(chan bool)
-	var d amqp.Delivery
 
 	go func() {
-		for d = range msgs {
+		for d := range msgs {
 			log.Printf(" [x] %s", d.Body)
 			done <- true
 		}
 	}()
 
 	log.Printf(" [*] Waiting for logs. To exit press CTRL+C")
-	select {
-	case <-done:
-		break
-	}
+	<-done
 	log.Printf("Done")
 
 	os.Exit(0)
diff --git a/go/receive_logs_topic.go b/go/receive_logs_topic.go
index 877cfe8..7e70ae6 100644
--- a/go/receive_logs_topic.go
+++ b/go/receive_logs_topic.go
@@ -43,8 +43,7 @@ func main() {
 	)
 	failOnError(err, "Failed to declare a queue")
 
-	var s string
-	for _, s = range os.Args {
+	for _, s := range os.Args {
 		log.Printf("Binding queue %s to exchange %s with routing key %s", q.Name, "logs_topic", s)
 		err = ch.QueueBind(
 			q.Name,        // queue name
@@ -58,10 +57,9 @@ func main() {
 	msgs, err := ch.Consume(q.Name, "", true, false, false, false, nil)
 
 	done := make(chan bool)
-	var d amqp.Delivery
 
 	go func() {
-		for d = range msgs {
+		for d := range msgs {
 			log.Printf(" [x] %s", d.Body)
 			done <- true
 		}
diff --git a/go/worker.go b/go/worker.go
index ee1e173..c86ba56 100644
--- a/go/worker.go
+++ b/go/worker.go
@@ -40,10 +40,9 @@ func main() {
 	failOnError(err, "Failed to register a consumer")
 
 	done := make(chan bool)
-	var d amqp.Delivery
 
 	go func() {
-		for d = range msgs {
+		for d := range msgs {
 			log.Printf("Received a message: %s", d.Body)
 			d.Ack(false)
 			done <- true
@@ -51,10 +50,7 @@ func main() {
 	}()
 
 	log.Printf(" [*] Waiting for messages. To exit press CTRL+C")
-	select {
-	case <-done:
-		break
-	}
+	<-done
 	log.Printf("Done")
 
 	os.Exit(0)