Refactor readers