wee bits of cleanup