diff --git a/uniuri.go b/uniuri.go
index bb9eab9..ef1cd24 100644
--- a/uniuri.go
+++ b/uniuri.go
@@ -28,14 +28,14 @@ import (
 )
 
 const (
-	// Standard length of uniuri string to achive ~95 bits of entropy.
+	// StdLen is a standard length of uniuri string to achive ~95 bits of entropy.
 	StdLen = 16
-	// Length of uniurl string to achive ~119 bits of entropy, closest
+	// UUIDLen is a length of uniuri string to achive ~119 bits of entropy, closest
 	// to what can be losslessly converted to UUIDv4 (122 bits).
 	UUIDLen = 20
 )
 
-// Standard characters allowed in uniuri string.
+// StdChars is a set of standard characters allowed in uniuri string.
 var StdChars = []byte("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789")
 
 // New returns a new random string of the standard length, consisting of
diff --git a/uniuri_test.go b/uniuri_test.go
index 28b882c..c564c60 100644
--- a/uniuri_test.go
+++ b/uniuri_test.go
@@ -34,13 +34,13 @@ func TestNew(t *testing.T) {
 
 	// Generate 1000 uniuris and check that they are unique
 	uris := make([]string, 1000)
-	for i, _ := range uris {
+	for i := range uris {
 		uris[i] = New()
 	}
 	for i, u := range uris {
 		for j, u2 := range uris {
 			if i != j && u == u2 {
-				t.Fatalf("not unique: %d:%q and %d:%q", i, j, u, u2)
+				t.Fatalf("not unique: %d:%q and %d:%q", i, u, j, u2)
 			}
 		}
 	}