Refactor fenci