Getting rid of horrific code once and for all.