minor stylistic refinements