More code formatting