tweak, clarify, remove dead code