Added to-do list
clean-up