Refactor line into line list, change nameType