untracked.py: code simplification