Minor refactorings on the reading strucutre