Code clean up.
Merge pull request #35 from pferraro/master

Code clean up.