Updated code accordingly SensioLabsInsight recomendation