Bit of clean up