some cleanup of comments