XD-270 Refactoring reader model based on code review