diff --git a/script/Diagnostics/WireScan.py b/script/Diagnostics/WireScan.py
index c8c3d69..ee51c1f 100644
--- a/script/Diagnostics/WireScan.py
+++ b/script/Diagnostics/WireScan.py
@@ -6,22 +6,13 @@ run("Devices/WireScanner")
 BPM_SENSORS = [("x","X1"), ("y","Y1"), ("q","Q1")] #(logic name sufix, channel sufix)
 
 #Paramter parsing
-if is_panel:
-    prefix = args[0]
-    sel = args[1]
-    start = args[2]
-    end = args[3]
-    cycles = args[4]
-    velocity = args[5]
-    bpm3 = args[6]
-else:
-    prefix =  "S30CB09-DWSC440" #"SARCL02-DWSC270" # "SINDI01-DWSC090" #"SARCL02-DWSC270"
-    sel = WireScanner.W1X
-    start = -200
-    end = 200
-    cycles = 5
-    velocity = 200
-    bpm3 = None
+prefix   = args[0] if is_panel else "S30CB09-DWSC440"
+sel      = args[1] if is_panel else WireScanner.W1X
+start    = args[2] if is_panel else -200
+end      = args[3] if is_panel else 200
+cycles   = args[4] if is_panel else 5
+velocity = args[5] if is_panel else 200
+bpm3     = args[6] if is_panel else None
 print "WireScan parameters: ", prefix, sel, start, end, cycles, cycles, bpm3
 
 #Creating WireScanner object
@@ -66,11 +57,11 @@ def check_end_scan(record, scan):
         print "Data aquisition completed"
         scan_complete=True
         scan.abort()
+        record.cancel() #So it won't be saved
     elif record[2] != cur_cycle:
         cur_cycle = record[2]
         get_context().dataManager.splitScanData(scan)
 
-
 #Metadata
 set_attribute("/", "Wire Scan", prefix)    
 set_attribute("/", "Selection", sel)