So I gave myself a bit of a code-review