More tightening up of comments