Code cleanup.
Merge pull request #21 from pferraro/master

Code cleanup.