Clarify some comments and kill some cruft