Some refacto