@@ -26,23 +26,14 @@
 	hd.hash = fnv.New64a()
 	hd.first = read(args[0], hd.hash)
 	hd.second = read(args[1], hd.hash)
 
 	var result diff.Delta = diff.Diff(&hd)
-	//var marks []diff.Mark = make([]diff.Mark, len(result.Added)+len(result.Removed))
-
-	//var added, removed []diff.Mark = result.Added, result.Removed
-	fmt.Println(result)
 
 	gen := source(result)
 	for have, added, mark := gen(); have; have, added, mark = gen() {
-		var from []line
-		if added {
-			from = hd.second
-		} else {
-			from = hd.first
-		}
+		var from []line = hd.line(!added)
 
 		fmt.Println()
 		for i := mark.From; i < mark.Length; i++ {
 			fmt.Print(i)
 			if added {
@@ -54,10 +45,12 @@
 		}
 	}
 
 }
 
+// Returns a closure over the provided diff.Delta
+// that returns diff.Mark entries while prioritizing removals when possible
 func source(d diff.Delta) func() (bool, bool, diff.Mark) {
 	var addedAt, removedAt int = 0, 0
 	return func() (bool, bool, diff.Mark) {
 		var addsOver bool = addedAt == len(d.Added)
 		var removesOver bool = removedAt == len(d.Removed)
@@ -103,23 +96,33 @@
 type hashDiff struct {
 	first, second []line
 	hash          hash.Hash64
 }
 
+// Required per diff.Interface
 func (h *hashDiff) Equal(i, j int) bool {
-	// return h.first[i].text == h.second[j].text
 	if h.first[i].hash != h.second[j].hash {
 		return false
 	} else {
 		return h.first[i].text == h.second[j].text
 	}
 }
 
+// Required per diff.Interface
 func (h *hashDiff) Len() (int, int) {
 	return len(h.first), len(h.second)
 }
 
+// A helper method for getting a line slice
+func (h *hashDiff) line(first bool) []line {
+	if first {
+		return h.first
+	}
+	return h.second
+}
+
+// Holds a text line and its hash
 type line struct {
 	hash uint64
 	text string
 }