Refactoring LineList and Line