Minor refactoring to change lists.