some cleanup and addressing pending review comment