some code style fixes.