diff --git a/link.rb b/link.rb
index fd95534..fc7c045 100644
--- a/link.rb
+++ b/link.rb
@@ -24,21 +24,17 @@ bash "${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/Instabug.framework/Instabu
 # Get useful variables
 project = Xcodeproj::Project.open(project_location)
 frameworks_group = project.groups.find { |group| group.display_name == 'Frameworks' }
-frameworks_group = project.new_group('Frameworks') if frameworks_group == nil 
+frameworks_group ||= project.new_group('Frameworks')
 target = project.targets.find { |target| target.to_s == target_name }
 frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'FrameworksBuildPhase' }
 
 # Add new "Embed Frameworks" build phase to target
 embed_frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'Embed Frameworks'}
 Kernel.exit(0) if embed_frameworks_build_phase 
-
-if embed_frameworks_build_phase == nil
-  is_linked = false
-  embed_frameworks_build_phase = project.new(Xcodeproj::Project::Object::PBXCopyFilesBuildPhase)
-  embed_frameworks_build_phase.name = 'Embed Frameworks'
-  embed_frameworks_build_phase.symbol_dst_subfolder_spec = :frameworks
-  target.build_phases << embed_frameworks_build_phase
-end 
+embed_frameworks_build_phase = project.new(Xcodeproj::Project::Object::PBXCopyFilesBuildPhase)
+embed_frameworks_build_phase.name = 'Embed Instabug Framework'
+embed_frameworks_build_phase.symbol_dst_subfolder_spec = :frameworks
+target.build_phases << embed_frameworks_build_phase 
 
 # Add framework search path to target
 ['Debug', 'Release'].each do |config|
@@ -52,21 +48,15 @@ end
 end
 
 # Add framework to target as "Embedded Frameworks"
-framework_ref = frameworks_group.files.find { |file_reference| file_reference.path == "#{framework_root}/#{framework_name}"}
+framework_ref = frameworks_group.new_file("#{framework_root}/#{framework_name}")
+build_file = embed_frameworks_build_phase.add_file_reference(framework_ref)
+frameworks_build_phase.add_file_reference(framework_ref)
+build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy', 'RemoveHeadersOnCopy'] }
 
-if framework_ref == nil
-  framework_ref = frameworks_group.new_file("#{framework_root}/#{framework_name}")
-  build_file = embed_frameworks_build_phase.add_file_reference(framework_ref)
-  frameworks_build_phase.add_file_reference(framework_ref)
-  build_file.settings = { 'ATTRIBUTES' => ['CodeSignOnCopy', 'RemoveHeadersOnCopy'] }
-end
 
 #Add New Run Script Phase to Build Phases
-shell_script_build_phase = target.shell_script_build_phases.find { |build_phase| build_phase.to_s == INSTABUG_PHASE_NAME }
-if shell_script_build_phase == nil
-  phase = target.new_shell_script_build_phase(INSTABUG_PHASE_NAME)
-  phase.shell_script = INSTABUG_PHASE_SCRIPT
-end
+phase = target.new_shell_script_build_phase(INSTABUG_PHASE_NAME)
+phase.shell_script = INSTABUG_PHASE_SCRIPT
 
 # Save Xcode project
 project.save
\ No newline at end of file
diff --git a/unlink.rb b/unlink.rb
index 4629857..d994fb6 100644
--- a/unlink.rb
+++ b/unlink.rb
@@ -26,22 +26,21 @@ frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to
 # Remove "Embed Frameworks" build phase to target
 embed_frameworks_build_phase = target.build_phases.find { |build_phase| build_phase.to_s == 'Embed Frameworks'}
 Kernel.exit(0) unless embed_frameworks_build_phase
-target.build_phases.delete(embed_frameworks_build_phase) if embed_frameworks_build_phase
+target.build_phases.delete(embed_frameworks_build_phase)
 
 # Remove framework search path from target
 ['Debug', 'Release'].each do |config|
-	# is_string ||= target.build_settings(config)['FRAMEWORK_SEARCH_PATHS'].is_a? String 
-	target.build_settings(config)['FRAMEWORK_SEARCH_PATHS'].delete(framework_root) if target.build_settings(config)['FRAMEWORK_SEARCH_PATHS'].is_a? Array
+	target.build_settings(config)['FRAMEWORK_SEARCH_PATHS'].delete(framework_root)
 end
 
 # Remove framework from target from "Embedded Frameworks"
 framework_ref = frameworks_group.files.find { |file_reference| file_reference.path == "#{framework_root}/#{framework_name}"}
 frameworks_build_phase.remove_file_reference(framework_ref)
-framework_ref.remove_from_project if framework_ref
+framework_ref.remove_from_project
 
 #Delete New Run Script Phase from Build Phases
 shell_script_build_phase = target.shell_script_build_phases.find { |build_phase| build_phase.to_s == INSTABUG_PHASE_NAME }
-target.build_phases.delete(shell_script_build_phase) if shell_script_build_phase
+target.build_phases.delete(shell_script_build_phase)
 
 # Save Xcode project
 project.save
\ No newline at end of file