address initial code review comments