Modification for SensioLabsInsights validation and PSR-2