FileHandler refactor