tightening up details
Merge pull request #5 from cmakler/further-cleanup

tightening up details