Refactor with Hyde