Move the console "trick" to its own file
Refactor for no reason