Small stylistic improvements