Added comments as requested in review.