Refactoring Parser -> FileReader