Spec refactor