Comment cleanup: Add clarifications, remove cruft