I felt like a bit of a code cleanup, you know (imagine a british accent)