Refactor list creation