20/code.go

@@ -48,11 +48,7 @@ func establishNewIndex(size int, current int, value int) int {
 		return size - rest
 	}
 
-	if delta >= size {
-		return delta % size
-	}
-
-	return delta
+	return delta % size
 }
 
 func removeAt(numbers []int, index int) []int {
@@ -98,7 +94,7 @@ func part1(mixed []int) int {
 	size := len(mixed)
 
 	for i := 1; i < 4; i++ {
-		index := (zeroIndex + i*1000) % size
+		index := establishNewIndex(size, zeroIndex, i*1000)
 		result += mixed[index]
 	}