Completed refactoring for studies within studies