Intraop refactor