Touch of clean up