Bit of clean up.