Refacto done