Cleanups for pull request #2