a couple of cleanups before pull request