diff --git a/internal/dns/dns.go b/internal/dns/dns.go
index aa68f4b..6f43bf4 100644
--- a/internal/dns/dns.go
+++ b/internal/dns/dns.go
@@ -409,7 +409,7 @@ func findNameserversForDomain(
 	}
 
 	// Check on-chain domains first
-	for startLabelIdx := 0; startLabelIdx < len(queryLabels); startLabelIdx++ {
+	for startLabelIdx := range queryLabels {
 		lookupDomainName := strings.Join(queryLabels[startLabelIdx:], ".")
 		// Convert to canonical form for consistency
 		lookupDomainName = dns.CanonicalName(lookupDomainName)
diff --git a/internal/handshake/domain.go b/internal/handshake/domain.go
index 01f1637..fab69a8 100644
--- a/internal/handshake/domain.go
+++ b/internal/handshake/domain.go
@@ -246,7 +246,7 @@ func (t *TextDomainRecord) decode(r *BytesReader) error {
 		return err
 	}
 	var size uint8
-	for i := 0; i < int(length); i++ {
+	for range int(length) {
 		// Read item size
 		if err := binary.Read(r, binary.LittleEndian, &size); err != nil {
 			return err
@@ -297,7 +297,7 @@ func domainRecordNameDecode(r *BytesReader) (string, error) {
 			if c > DnsMaxLabel {
 				return "", errors.New("label too long")
 			}
-			for j := 0; j < int(c); j++ {
+			for range int(c) {
 				b, err := r.ReadByte()
 				if err != nil {
 					return "", err
@@ -329,7 +329,7 @@ func domainRecordNameDecode(r *BytesReader) (string, error) {
 			data := r.OriginalBytes()
 			r = NewBytesReader(data)
 			// Read and discard bytes until we reach the calculated offset
-			for j := 0; j < offset; j++ {
+			for range offset {
 				if _, err := r.ReadByte(); err != nil {
 					return "", err
 				}
diff --git a/internal/handshake/spv.go b/internal/handshake/spv.go
index 3a5cf4e..3e15bd1 100644
--- a/internal/handshake/spv.go
+++ b/internal/handshake/spv.go
@@ -106,7 +106,7 @@ func (p *Proof) Decode(r *bytes.Buffer) error {
 		return err
 	}
 	p.Nodes = make([]ProofNode, count)
-	for i := 0; i < int(count); i++ {
+	for i := range int(count) {
 		item := &ProofNode{}
 		if hasBit(bitMap, i) {
 			bits, bytes, err := readBitlen(r)
@@ -279,7 +279,7 @@ func (p *Proof) has(
 	x := 0
 	y := depth
 	var c uint16
-	for i := 0; i < int(tmpLen); i++ {
+	for range int(tmpLen) {
 		if hasBit(prefix, int(x)) != hasBit(key, int(y)) {
 			break
 		}