Code style fixes, no code changes