final list of todo added and cleaning