more code formatting fixes