Formatting changes, some instruction reordering, use of %run