Minor cleanup (phrasing, code tidying up)