diff --git a/pkg/adt/interval_tree.go b/pkg/adt/interval_tree.go
index ec302e4a7..342eab75b 100644
--- a/pkg/adt/interval_tree.go
+++ b/pkg/adt/interval_tree.go
@@ -81,12 +81,12 @@ func (x *intervalNode) color() rbcolor {
 	return x.c
 }
 
-func (n *intervalNode) height() int {
-	if n == nil {
+func (x *intervalNode) height() int {
+	if x == nil {
 		return 0
 	}
-	ld := n.left.height()
-	rd := n.right.height()
+	ld := x.left.height()
+	rd := x.right.height()
 	if ld < rd {
 		return rd + 1
 	}
diff --git a/pkg/cpuutil/endian.go b/pkg/cpuutil/endian.go
index 6ab898d4b..06c06cd4a 100644
--- a/pkg/cpuutil/endian.go
+++ b/pkg/cpuutil/endian.go
@@ -27,7 +27,7 @@ var byteOrder binary.ByteOrder
 func ByteOrder() binary.ByteOrder { return byteOrder }
 
 func init() {
-	var i int = 0x1
+	i := int(0x1)
 	if v := (*[intWidth]byte)(unsafe.Pointer(&i)); v[0] == 0 {
 		byteOrder = binary.BigEndian
 	} else {