Some whitespace and code style fixes.