Little clean and refacto