Refactor with Eiko