better list, cleaning, etc