updates to code review feedback