Minor stylistic improvements