tightened up, removed cruft