Minor readability refactors