further stylistic improvements