Store full filename in key
Removed a few useless print statements