Minor cleanup
Use dictionary for old files
Fixes