Improve readability
Merge pull request #21 from nferraz/master

code cleanup