updated after code cleanup and making targets into list.txt