Refactor order and exclude with lists