cleanups to prep for code review