Reduced formating differences to master