issue #9 - removendo if's desnecessarios