tweaks to address code review comments