Append comparison diff to the error messages when applicable
Minor PSR2 coding style fixes