Refactor List