Some stylistic fixups