fixes to code review comments