Some stylistic fixes