[RFC] some review suggestions

:baby: