Refactors varios