diff --git a/kernel/arch/i386/TTY.cpp b/kernel/arch/i386/TTY.cpp
index 949b07e1..9ff63619 100644
--- a/kernel/arch/i386/TTY.cpp
+++ b/kernel/arch/i386/TTY.cpp
@@ -250,7 +250,7 @@ void TTY::PutCharAt(uint16_t ch, size_t x, size_t y)
 	cell.character = ch;
 	cell.foreground = m_foreground;
 	cell.background = m_background;
-	VESA::PutEntryAt(ch, x, y, m_foreground, m_background);
+	VESA::PutCharAt(ch, x, y, m_foreground, m_background);
 }
 
 void TTY::PutChar(char ch)
@@ -356,7 +356,7 @@ void TTY::PutCharCurrent(char ch)
 			y++;
 			break;
 		default:
-			VESA::PutEntryAt(ch, x, y, VESA::Color::BRIGHT_WHITE, VESA::Color::BLACK);
+			VESA::PutCharAt(ch, x, y, VESA::Color::BRIGHT_WHITE, VESA::Color::BLACK);
 			break;
 		}
 
diff --git a/kernel/arch/i386/VESA.cpp b/kernel/arch/i386/VESA.cpp
index 27d8e111..7f609071 100644
--- a/kernel/arch/i386/VESA.cpp
+++ b/kernel/arch/i386/VESA.cpp
@@ -26,48 +26,38 @@ namespace VESA
 	static uint32_t	s_height	= 0;
 	static uint8_t	s_mode		= 0;
 
+	static uint32_t s_terminal_width  = 0;
+	static uint32_t s_terminal_height = 0;
+
+	static void (*PutCharAtImpl)(uint16_t, uint32_t, uint32_t, Color, Color) = nullptr;
+	static void (*ClearImpl)(Color) = nullptr;
+
 	static void GraphicsPutCharAt(uint16_t ch, uint32_t x, uint32_t y, Color fg, Color bg);
 	static void GraphicsClear(Color color);
 
 	static void TextPutCharAt(uint16_t ch, uint32_t x, uint32_t y, Color fg, Color bg);
 	static void TextClear(Color color);
 
-	void PutEntryAt(uint16_t ch, uint32_t x, uint32_t y, Color fg, Color bg)
+	void PutCharAt(uint16_t ch, uint32_t x, uint32_t y, Color fg, Color bg)
 	{
-		if (x >= s_width)
+		if (x >= s_width || y >= s_height)
 			return;
-		if (y >= s_height)
-			return;
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_GRAPHICS)
-			return GraphicsPutCharAt(ch, x, y, fg, bg);
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_TEXT)
-			return TextPutCharAt(ch, x, y, fg, bg);
+		PutCharAtImpl(ch, x, y, fg, bg);
 	}
 
 	void Clear(Color color)
 	{
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_GRAPHICS)
-			return GraphicsClear(color);
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_TEXT)
-			return TextClear(color);
+		ClearImpl(color);
 	}
 
 	uint32_t GetTerminalWidth()
 	{
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_GRAPHICS)
-			return s_width / font.Width;
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_TEXT)
-			return s_width;
-		return 0;
+		return s_terminal_width;
 	}
 
 	uint32_t GetTerminalHeight()
 	{
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_GRAPHICS)
-			return s_height / font.Height;
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_TEXT)
-			return s_height;
-		return 0;
+		return s_terminal_height;
 	}
 
 	bool Initialize()
@@ -91,18 +81,26 @@ namespace VESA
 				return false;
 			}
 
-			GraphicsClear(Color::BLACK);
-			return true;
+			PutCharAtImpl = GraphicsPutCharAt;
+			ClearImpl = GraphicsClear;
+			s_terminal_width = s_width / font.Width;
+			s_terminal_height = s_height / font.Height;
 		}
-		
-		if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_TEXT)
+		else if (s_mode == MULTIBOOT_FRAMEBUFFER_TYPE_TEXT)
 		{
-			TextClear(Color::BLACK);
-			return true;
+			PutCharAtImpl = TextPutCharAt;
+			ClearImpl = TextClear;
+			s_terminal_width = s_width;
+			s_terminal_height = s_height;
 		}
-		
-		dprintln("Unsupported type for VESA framebuffer");
-		return false;
+		else
+		{
+			dprintln("Unsupported type for VESA framebuffer");
+			return false;
+		}
+
+		ClearImpl(Color::BLACK);
+		return true;
 	}
 
 	static uint32_t s_graphics_colors[]
diff --git a/kernel/include/kernel/TTY.h b/kernel/include/kernel/TTY.h
index 81c2cac9..541fc95e 100644
--- a/kernel/include/kernel/TTY.h
+++ b/kernel/include/kernel/TTY.h
@@ -23,7 +23,7 @@ private:
 	inline void RenderFromBuffer(size_t x, size_t y)
 	{
 		const auto& cell = m_buffer[y * m_width + x];
-		VESA::PutEntryAt(cell.character, x, y, cell.foreground, cell.background);
+		VESA::PutCharAt(cell.character, x, y, cell.foreground, cell.background);
 	}
 
 private:
diff --git a/kernel/include/kernel/VESA.h b/kernel/include/kernel/VESA.h
index 80acae98..8ed8129c 100644
--- a/kernel/include/kernel/VESA.h
+++ b/kernel/include/kernel/VESA.h
@@ -26,7 +26,7 @@ namespace VESA
 	};
 
 	bool Initialize();
-	void PutEntryAt(uint16_t, uint32_t, uint32_t, Color, Color);
+	void PutCharAt(uint16_t, uint32_t, uint32_t, Color, Color);
 	void Clear(Color);
 
 	uint32_t GetTerminalWidth();