file utils refactor