Fix #66 part 3; comments cleanup