Refacto Controllers/Models