minor semantic improvements