A couple of stylistic fixes