Formatting and scoping (private[spark]) updates