Replace some stuff with oneliner

Combine unpacking of tuple into one line
Use iterator for finding available filename