refacto & cleaning