Fix syntax
Finish unifying calculation through FileStat