clarity & consistency tweaks