[Line Number] Work in progress - fixed preview. Small refactorization.