Update comments following @oni-link suggestions