Alguns refactors