giant tidy up the likes of which we have never seen. I am ever doomed to rewrite the same code over and over.