Comment improvements suggested by @oni-link