File info: code refactoring
Merge pull request #1 from irvingprog/master

File info: code refactoring