plural: minor cleanup