Cleaned here and there