Doc + cleanup