Refactor list