diff --git a/TODO b/TODO
index 70271c8..ab7599a 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-TODO:
-
 - The consumer code needs a much cleaner abstraction
     In the end, it's two-phase, e.g. receive message, ack message, perhaps we make this a
     first-class citizen in the API on the consumer side where the consumer calls:
diff --git a/barrier.go b/barrier.go
index d3f442f..968f2c6 100644
--- a/barrier.go
+++ b/barrier.go
@@ -8,7 +8,7 @@
 	if len(upstream) == 0 {
 		panic("At least one upstream cursor is required.")
 	} else if len(upstream) == 1 {
-		return upstream[0]
+		return upstream[0] // TODO: better performance through the interface by dereferencing?
 	} else {
 		return NewCompositeBarrier(upstream...)
 	}
diff --git a/writer.go b/writer.go
index 0f710d9..bd1c47c 100644
--- a/writer.go
+++ b/writer.go
@@ -21,13 +21,12 @@
 }
 
 func assertPowerOfTwo(value int64) {
-	// http://en.wikipedia.org/wiki/Power_of_two#Fast_algorithm_to_check_if_a_positive_number_is_a_power_of_two
 	if value > 0 && (value&(value-1)) != 0 {
+		// http://en.wikipedia.org/wiki/Power_of_two#Fast_algorithm_to_check_if_a_positive_number_is_a_power_of_two
 		panic("The ring capacity must be a power of two, e.g. 2, 4, 8, 16, 32, 64, etc.")
 	}
 }
 
-// TODO: one reason to make this signature lower/upper across both writers is so that the Commit signature could look the same as well
 func (this *Writer) Reserve(items int64) int64 {
 	next := this.previous + items
 	wrap := next - this.capacity