file utils refactoring