More code formatting fixes