Bit of cleanup