Minor clarity improvements