remove unnecessary cruft; add relevant comments