More cleanup
Improved format of 'finished...' filenames