Minor nits and typos cleanup