content updated + cleanup