diff --git a/goatherd_test.go b/goatherd_test.go
index a6af354df5b329d49523923464fab9a983fe99d6..19d7d07d851b5c26dd508b76bcfe36ce4df44e36 100644
--- a/goatherd_test.go
+++ b/goatherd_test.go
@@ -73,17 +73,17 @@ func aborted(t *testing.T, err error, aborted ...interface{}) bool {
 	if transaction_failed(err) {
 		t.Log(aborted...)
 		return true
-	} else {
-		t_err_fatal(t, err)
 	}
 
+	t_err_fatal(t, err)
+
 	return false
 }
 
 func interleaved_transactions_t(t *testing.T) {
 	var err error
 	var txs [2]*sql.Tx
-	for i, _ := range txs {
+	for i := range txs {
 		txs[i], err = db.Begin()
 		t_err_fatal(t, err)
 		defer func(i int) { txs[i].Rollback() }(i)