cleanups per pull request discussion