Complete Refactoring

Obligatory sacrifice of a CRT monitor