Adding comments, cleaning things up a bit.
Merge pull request #9 from kcarcia/comments

Adding comments, cleaning things up a bit.