minor cleanups after merging pull request from jogaco