diff --git a/internal/decoders/data_packet_chunk.go b/internal/decoders/data_packet_chunk.go
index f2a6915..a1e2602 100644
--- a/internal/decoders/data_packet_chunk.go
+++ b/internal/decoders/data_packet_chunk.go
@@ -24,14 +24,14 @@ func DecodeDataPacketChunk(bytes []byte) DataPacketChunk {
 
 		for offset < int(chunk.Header.DataLen) {
 			switch id := binary.LittleEndian.Uint16(chunk.ChunkData[offset : offset+2]); id {
-			case 0:
+			case 0x0000:
 				packet_header := DecodePacketHeaderChunk(chunk.ChunkData[offset:])
 				data.PacketHeader = &packet_header
 				offset += 4
 				if packet_header.Chunk.Header.DataLen > 0 {
 					offset = offset + int(packet_header.Chunk.Header.DataLen)
 				}
-			case 1:
+			case 0x0001:
 				tracker_list := DecodeDataTrackerListChunk(chunk.ChunkData[offset:])
 				data.TrackerList = &tracker_list
 				offset += 4
diff --git a/internal/decoders/data_tracker_chunk.go b/internal/decoders/data_tracker_chunk.go
index 13cba83..038d5e9 100644
--- a/internal/decoders/data_tracker_chunk.go
+++ b/internal/decoders/data_tracker_chunk.go
@@ -29,49 +29,49 @@ func DecodeDataTrackerChunk(bytes []byte) DataTrackerChunk {
 
 		for offset < int(chunk.Header.DataLen) {
 			switch id := binary.LittleEndian.Uint16(chunk.ChunkData[offset : offset+2]); id {
-			case 0:
+			case 0x0000:
 				pos := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
 				data.Pos = &pos
 				offset += 4
 				if data.Pos.Chunk.Header.DataLen > 0 {
 					offset = offset + int(data.Pos.Chunk.Header.DataLen)
 				}
-			case 1:
+			case 0x0001:
 				speed := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
 				data.Speed = &speed
 				offset += 4
 				if data.Speed.Chunk.Header.DataLen > 0 {
 					offset = offset + int(data.Speed.Chunk.Header.DataLen)
 				}
-			case 2:
+			case 0x0002:
 				ori := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
 				data.Ori = &ori
 				offset += 4
 				if data.Ori.Chunk.Header.DataLen > 0 {
 					offset = offset + int(data.Ori.Chunk.Header.DataLen)
 				}
-			case 3:
+			case 0x0003:
 				status := DecodeDataTrackerStatusChunk(chunk.ChunkData[offset:])
 				data.Status = &status
 				offset += 4
 				if data.Status.Chunk.Header.DataLen > 0 {
 					offset = offset + int(data.Status.Chunk.Header.DataLen)
 				}
-			case 4:
+			case 0x0004:
 				accel := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
 				data.Accel = &accel
 				offset += 4
 				if data.Accel.Chunk.Header.DataLen > 0 {
 					offset = offset + int(data.Accel.Chunk.Header.DataLen)
 				}
-			case 5:
+			case 0x0005:
 				trgtpos := DecodeDataTrackerXYZChunk(chunk.ChunkData[offset:])
 				data.TrgtPos = &trgtpos
 				offset += 4
 				if data.TrgtPos.Chunk.Header.DataLen > 0 {
 					offset = offset + int(data.TrgtPos.Chunk.Header.DataLen)
 				}
-			case 6:
+			case 0x0006:
 				timestamp := DecodeDataTrackerTimestampChunk(chunk.ChunkData[offset:])
 				data.Timestamp = &timestamp
 				offset += 4
diff --git a/internal/decoders/info_packet_chunk.go b/internal/decoders/info_packet_chunk.go
index abbbeb5..b07c2a6 100644
--- a/internal/decoders/info_packet_chunk.go
+++ b/internal/decoders/info_packet_chunk.go
@@ -25,21 +25,21 @@ func DecodeInfoPacketChunk(bytes []byte) InfoPacketChunk {
 
 		for offset < int(chunk.Header.DataLen) {
 			switch id := binary.LittleEndian.Uint16(chunk.ChunkData[offset : offset+2]); id {
-			case 0:
+			case 0x0000:
 				packet_header := DecodePacketHeaderChunk(chunk.ChunkData[offset:])
 				data.PacketHeader = &packet_header
 				offset += 4
 				if packet_header.Chunk.Header.DataLen > 0 {
 					offset = offset + int(packet_header.Chunk.Header.DataLen)
 				}
-			case 1:
+			case 0x0001:
 				system_name := DecodeInfoSystemNameChunk(chunk.ChunkData[offset:])
 				data.SystemName = &system_name
 				offset += 4
 				if system_name.Chunk.Header.DataLen > 0 {
 					offset = offset + int(system_name.Chunk.Header.DataLen)
 				}
-			case 2:
+			case 0x0002:
 				tracker_list := DecodeInfoTrackerListChunk(chunk.ChunkData[offset:])
 				data.TrackerList = &tracker_list
 				offset += 4
diff --git a/internal/decoders/info_tracker_chunk.go b/internal/decoders/info_tracker_chunk.go
index efc0501..67169eb 100644
--- a/internal/decoders/info_tracker_chunk.go
+++ b/internal/decoders/info_tracker_chunk.go
@@ -23,7 +23,7 @@ func DecodeInfoTrackerChunk(bytes []byte) InfoTrackerChunk {
 
 		for offset < int(chunk.Header.DataLen) {
 			switch id := binary.LittleEndian.Uint16(chunk.ChunkData[offset : offset+2]); id {
-			case 0:
+			case 0x0000:
 				tracker_name := DecodeInfoTrackerNameChunk(chunk.ChunkData[offset:])
 				data.TrackerName = &tracker_name
 				offset += 4