refactor with jeffrey