more comments and renaming
Merge pull request #59 from countschokula/master

more comments and renaming