Finalize refactor with staff_course