Updated comments following PR comments