minor style & non-style fixes