Refactoring pronto