more cleanup of comments