Refactor list id