Corrigindo as classes