Refactor FileReader