cleaned up expandable list code