fixing portugue spelling bug ..

.. and some few refactorings.