Some code formatting changes