Refactor untaint, add list of ints