Comment changes following Tom's review, plus removing two lines of useless code.