[IRESReader] - Refactoring