Improve John's post-run file manipulation