[files] refactoring
[files] fix typos