Minor Corrections To Carl's Commit

Viz #109 - this just cleans up for readability.