code clean
Merge pull request #15 from pmitros/swdanielli/code_clean

code clean