Fix typo
Refactor of reader classes