Cleanup: use some more vector instead of list.