Minor refacto