minor changes, mainly stylistic