more code formatting changes