Code cleaning, Thanks SensioLabsInsight