Minor code refactor in list model