Match settings updated notice

plus some code formatting within the same function