Extra styling and code style fixes.