Refactor from the beginning

Tacaleopau Nesse Carrinho Marcos :beers: