diff --git a/src/core/NewFunction.go b/src/core/NewFunction.go
index dabb185..1450660 100644
--- a/src/core/NewFunction.go
+++ b/src/core/NewFunction.go
@@ -24,12 +24,12 @@ func NewFunction(pkg string, name string, file *fs.File) *Function {
 				Scopes: []*scope.Scope{{}},
 			},
 			CPU: cpu.CPU{
-				All:           x86.AllRegisters,
 				General:       x86.GeneralRegisters,
 				Input:         x86.InputRegisters,
 				Output:        x86.OutputRegisters,
 				SyscallInput:  x86.SyscallInputRegisters,
 				SyscallOutput: x86.SyscallOutputRegisters,
+				NumRegisters:  16,
 			},
 		},
 	}
diff --git a/src/core/PrintInstructions.go b/src/core/PrintInstructions.go
index 69cfc26..cc81953 100644
--- a/src/core/PrintInstructions.go
+++ b/src/core/PrintInstructions.go
@@ -44,7 +44,7 @@ func (f *Function) PrintInstructions() {
 		registers := bytes.Buffer{}
 		used := f.RegisterHistory[i]
 
-		for _, reg := range f.CPU.All {
+		for reg := range f.CPU.NumRegisters {
 			if used&(1<<reg) != 0 {
 				registers.WriteString("● ")
 			} else {
diff --git a/src/cpu/CPU.go b/src/cpu/CPU.go
index 4fe0571..d950cee 100644
--- a/src/cpu/CPU.go
+++ b/src/cpu/CPU.go
@@ -2,10 +2,10 @@ package cpu
 
 // CPU represents the processor.
 type CPU struct {
-	All           []Register
 	General       []Register
 	Input         []Register
 	Output        []Register
 	SyscallInput  []Register
 	SyscallOutput []Register
+	NumRegisters  byte
 }
diff --git a/src/x86/Registers.go b/src/x86/Registers.go
index dde5260..c5c8f18 100644
--- a/src/x86/Registers.go
+++ b/src/x86/Registers.go
@@ -22,7 +22,6 @@ const (
 )
 
 var (
-	AllRegisters             = []cpu.Register{RAX, RCX, RDX, RBX, RSP, RBP, RSI, RDI, R8, R9, R10, R11, R12, R13, R14, R15}
 	SyscallInputRegisters    = []cpu.Register{RAX, RDI, RSI, RDX, R10, R8, R9}
 	SyscallOutputRegisters   = []cpu.Register{RAX, RCX, R11}
 	GeneralRegisters         = []cpu.Register{RBX, R12, R13, R14, R15, RCX, R11}