Minor changes from review (mostly style)