Minor readability tweaks before PR