Minor stylistic change and rearrangement