Merge "Refactor TextLine class"