Commenting, cleaning, and improving code
Merge pull request #15 from gabofratta/master

clean up