FileReader: Refactor. Address #97.