Another note to myself.
A little tidying up, mostly to kick CodeClimate in the head.