Minor correction and cleanup.
Merge pull request #52 from dereuromark/master-cleanup

Minor correction and cleanup.