Cleanup: use vector instead of list.