final cleanups based on PR feedback