Refactor
    Refactor Parte II
    Fim do Refactor
Merge remote-tracking branch 'origin/master'