Improve refacto