diff --git a/.env b/.env
index 8884d6d..f996395 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,11 @@
-CC=i386-elf-gcc
-LD=i386-elf-ld
-AS=nasm
-AR=ar
+ARCH        = i386
+FORMAT      = elf
+CC          = $(ARCH)-$(FORMAT)-gcc
+LD          = $(ARCH)-$(FORMAT)-ld
+AS          = nasm
+AR          = ar
 
-CFLAGS=-ffreestanding -m32 -O2 -Wall -Wextra -pedantic # -DKERNEL_LOG
-LDFLAGS=-nostdlib
+CFLAGS      = -ffreestanding -m32 -O2 -Wall -Wextra -pedantic # -DKERNEL_LOG
+LDFLAGS     = -nostdlib
 
-QEMU=qemu-system-i386
+QEMU        = qemu-system-$(ARCH)
diff --git a/kernel/src/drivers/vga.c b/kernel/src/drivers/vga.c
deleted file mode 100644
index e69de29..0000000
diff --git a/kernel/src/drivers/vga.h b/kernel/src/drivers/vga.h
deleted file mode 100644
index e69de29..0000000