Some refactorings
Imp: error handling when opening input files
Chg: the way to display file names to add