tightened up commenting