Address review points from first submission