Some code formatting fixes