Small stylistic fixes