minor refactoring
using full file name for files in the same commit