more expandable list code cleanup