Add more comments (feedback from PR)