Code cleanup.
Merge pull request #46 from shawncoots/codeclean

Code cleanup.