diff --git a/Chronometer/Classes/MonitoredScript.ps1 b/Chronometer/Classes/MonitoredScript.ps1
index 4e9cf43..81dd38e 100644
--- a/Chronometer/Classes/MonitoredScript.ps1
+++ b/Chronometer/Classes/MonitoredScript.ps1
@@ -17,22 +17,16 @@ class MonitoredScript
     [int] SetScript([string]$Path)
     {
         $lineNumber = 0
-        foreach($command in (Get-Content -Path $Path))
+        foreach($command in ( Get-Content -Path $Path ))
         {
-            $this.Line.Add( 
-                [ScriptLine]@{
-                    Text = $command
-                    Path = $path
-                    LineNumber = $lineNumber
-                }
-            )
+            $this.Line.Add( [ScriptLine]::New($command, $path, $lineNumber) )            
             $lineNumber++
         }
         $this.LinesOfCode = $this.Line.Count
         return $this.LinesOfCode
     }
 
-    [void] AddExecution([hashtable]$node)
+    [void] AddExecution( [hashtable]$node )
     {
         # Line numbers start at 1 but the array starts at 0
         $lineNumber = $node.Breakpoint.Line - 1
diff --git a/Chronometer/Classes/ScriptLine.ps1 b/Chronometer/Classes/ScriptLine.ps1
index 277db44..8464077 100644
--- a/Chronometer/Classes/ScriptLine.ps1
+++ b/Chronometer/Classes/ScriptLine.ps1
@@ -10,13 +10,22 @@ class ScriptLine
     [string] $Path
     [string] $Text
     [System.Collections.ArrayList]$Executions
-    hidden [hashtable]$LastNode = $null
+    hidden [hashtable]$LastNode = @{}
 
     ScriptLine()
     {
-        $Executions = New-Object 'System.Collections.ArrayList'
+        $this.Executions = New-Object 'System.Collections.ArrayList'
     }
 
+    ScriptLine($Command, $Path, $LineNumber) 
+    {
+        $this.Executions = New-Object 'System.Collections.ArrayList'
+        $this.Text = $Command
+        $this.Path = $Path
+        $this.LineNumber = $LineNumber
+    }
+
+
     [void]AddExecutionTime([float]$Milliseconds)
     {
         $this.LastNode.Milliseconds = $Milliseconds