yalla: address comments on #246 by @jsquires