Merge "Revert "Revert "Refactor TextLine class"""