Refactor lists