cleanup

cleanup for pull request #8