Small refacto