Clean code

Apply recomendation from SensioLabsInsight