Bit of  cleanup