missed optimizations

----- Mensagem encaminhada de MAILER-DAEMON@sapo.pt -----
Ok, thank you all for your explanations!
I'll try to implement those improvements in the coming days.

Thanks,
Nuno