Split config_diff into two methods