add enumerate to one for loop
refs #1258
remove not needed arg from move_focus func
refs #1255