Refactory nos codigos