Remove string passing in favor of &Path