Bit of cleanup - v2