Some stylistic fixes.