Update usage of linked-list to be more reasonable.