clean-up and refinement (lists & pages mostly)