diff --git a/pkg/ueps/reader.go b/pkg/ueps/reader.go
index c0d4e33..581978d 100644
--- a/pkg/ueps/reader.go
+++ b/pkg/ueps/reader.go
@@ -49,12 +49,12 @@ func ReadAndVerify(reader *bufio.Reader, sharedSecret []byte) (*ParsedPacket, er
 			break
 		}
 
-		tagLengthByte, err := reader.ReadByte()
+		tagLength, err := reader.ReadByte()
 		if err != nil {
 			return nil, err
 		}
 
-		tagValue := make([]byte, int(tagLengthByte))
+		tagValue := make([]byte, int(tagLength))
 		if _, err := io.ReadFull(reader, tagValue); err != nil {
 			return nil, err
 		}
@@ -63,33 +63,33 @@ func ReadAndVerify(reader *bufio.Reader, sharedSecret []byte) (*ParsedPacket, er
 		case TagVersion:
 			header.Version = tagValue[0]
 			hmacInputBuffer.WriteByte(tagType)
-			hmacInputBuffer.WriteByte(tagLengthByte)
+			hmacInputBuffer.WriteByte(tagLength)
 			hmacInputBuffer.Write(tagValue)
 		case TagCurrentLayer:
 			header.CurrentLayer = tagValue[0]
 			hmacInputBuffer.WriteByte(tagType)
-			hmacInputBuffer.WriteByte(tagLengthByte)
+			hmacInputBuffer.WriteByte(tagLength)
 			hmacInputBuffer.Write(tagValue)
 		case TagTargetLayer:
 			header.TargetLayer = tagValue[0]
 			hmacInputBuffer.WriteByte(tagType)
-			hmacInputBuffer.WriteByte(tagLengthByte)
+			hmacInputBuffer.WriteByte(tagLength)
 			hmacInputBuffer.Write(tagValue)
 		case TagIntent:
 			header.IntentID = tagValue[0]
 			hmacInputBuffer.WriteByte(tagType)
-			hmacInputBuffer.WriteByte(tagLengthByte)
+			hmacInputBuffer.WriteByte(tagLength)
 			hmacInputBuffer.Write(tagValue)
 		case TagThreatScore:
 			header.ThreatScore = binary.BigEndian.Uint16(tagValue)
 			hmacInputBuffer.WriteByte(tagType)
-			hmacInputBuffer.WriteByte(tagLengthByte)
+			hmacInputBuffer.WriteByte(tagLength)
 			hmacInputBuffer.Write(tagValue)
 		case TagHMAC:
 			hmacSignature = tagValue
 		default:
 			hmacInputBuffer.WriteByte(tagType)
-			hmacInputBuffer.WriteByte(tagLengthByte)
+			hmacInputBuffer.WriteByte(tagLength)
 			hmacInputBuffer.Write(tagValue)
 		}
 	}