refactor lists