Minor stylistic fixes