Refactoring ConsoleWinodw.

Signed-off-by: Jacob Buysse <Jacob.Buysse@gmail.com>