Refactor with let