More code formatting fixes.