TOLTECS: Reduce the scope of one more variable