A little bit of this, a little bit of that

It was mostly a refactor job