Refactor with grilix