Make some clarifications based on feedback from @jspahrsummers