Refactoring of narrative table logic
Removed unnecessary code.