Lists refactored, extracting functions