Refacto finished