Fixes code style.
More code style fixes.