Added reviewer comments from second round